Enterprise Version
a lot of small details